diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 86ed065..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -7,8 +7,8 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +25,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +62,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +118,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '原始记录模板',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+//  下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 86ed065..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -7,8 +7,8 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +25,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +62,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +118,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '原始记录模板',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+//  下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
new file mode 100644
index 0000000..fb142e5
--- /dev/null
+++ b/src/views/system/tool/showPhoto.vue
@@ -0,0 +1,73 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  // title: {
+  //   type: String,
+  //   required: true,
+  // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 86ed065..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -7,8 +7,8 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +25,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +62,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +118,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '原始记录模板',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+//  下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
new file mode 100644
index 0000000..fb142e5
--- /dev/null
+++ b/src/views/system/tool/showPhoto.vue
@@ -0,0 +1,73 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  // title: {
+  //   type: String,
+  //   required: true,
+  // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 4f1305e..00046f8 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -4,9 +4,10 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
-import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
+import { addApi, getPhotoUrl, listPageDetailApi, updateApi } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签章名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签章负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签章描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -57,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -69,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -84,7 +86,10 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -128,6 +133,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
+  console.log()
   // 原生上传
   // 创建formdata对象
   const fd = new FormData()
@@ -187,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签章图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 86ed065..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -7,8 +7,8 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +25,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +62,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +118,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '原始记录模板',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+//  下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
new file mode 100644
index 0000000..fb142e5
--- /dev/null
+++ b/src/views/system/tool/showPhoto.vue
@@ -0,0 +1,73 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  // title: {
+  //   type: String,
+  //   required: true,
+  // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 4f1305e..00046f8 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -4,9 +4,10 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
-import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
+import { addApi, getPhotoUrl, listPageDetailApi, updateApi } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签章名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签章负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签章描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -57,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -69,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -84,7 +86,10 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -128,6 +133,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
+  console.log()
   // 原生上传
   // 创建formdata对象
   const fd = new FormData()
@@ -187,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签章图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 8ecbc8c..94d216e 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -123,17 +124,6 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-  //   if (res.code === 200) {
-  //     exportExcel({
-  //       json: res.data.rows.map((item: signType, index: number) => ({ index: index + 1, signNo: item.signNo, signName: item.signName, signDirector: item.signDirector, createTime: item.createTime, signDesc: item.signDesc })),
-  //       name: '签章管理',
-  //       titleArr: ['序号', '签章编号', '签章名称', '签章负责人', '创建时间', '描述'],
-  //       sheetName: 'sheet1',
-  //     })
-  //   }
-  //   loading.close()
-  // })
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签章管理')
     loading.close()
@@ -186,7 +176,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -199,13 +189,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -225,13 +215,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>

diff --git a/package.json b/package.json
index 0ebfaad..66d9604 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,11 @@
     "@tinymce/tinymce-vue": "^5.0.0",
     "@vueuse/core": "^9.5.0",
     "@vueuse/integrations": "^9.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.1.3",
     "dayjs": "^1.11.6",
+    "echarts": "^5.4.1",
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "hotkeys-js": "^3.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fa6a0a..dac9174 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,11 +13,14 @@
   '@vitejs/plugin-vue-jsx': ^2.1.1
   '@vueuse/core': ^9.5.0
   '@vueuse/integrations': ^9.5.0
+  '@wangeditor/editor': ^5.1.23
+  '@wangeditor/editor-for-vue': ^5.1.12
   autoprefixer: ^10.4.13
   axios: ^1.1.3
   bumpp: ^8.2.1
   cz-git: ^1.3.12
   dayjs: ^1.11.6
+  echarts: ^5.4.1
   element-plus: ^2.2.26
   eslint: ^8.27.0
   esno: ^0.16.3
@@ -71,8 +74,11 @@
   '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44
   '@vueuse/core': 9.5.0_vue@3.2.44
   '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe
+  '@wangeditor/editor': 5.1.23
+  '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone
   axios: 1.1.3
   dayjs: 1.11.6
+  echarts: registry.npmmirror.com/echarts/5.4.1
   element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44
   file-saver: 2.0.5
   hotkeys-js: 3.10.0
@@ -501,6 +507,13 @@
       - supports-color
     dev: true
 
+  /@babel/runtime/7.20.6:
+    resolution: {integrity: sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+    dev: false
+
   /@babel/template/7.18.10:
     resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
     engines: {node: '>=6.9.0'}
@@ -783,6 +796,10 @@
       vue: 3.2.44
     dev: false
 
+  /@transloadit/prettier-bytes/0.0.7:
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+    dev: false
+
   /@trysound/sax/0.2.0:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
@@ -802,6 +819,10 @@
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/event-emitter/0.3.3:
+    resolution: {integrity: sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q==}
+    dev: false
+
   /@types/fined/1.1.3:
     resolution: {integrity: sha512-CWYnSRnun3CGbt6taXeVo2lCbuaj4mchVJ4UF/BdU5TSuIn3AmS13pGMwCsBUoehGbhZrBrpNJZSZI5EVilXww==}
     dev: true
@@ -1027,6 +1048,47 @@
       eslint-visitor-keys: 3.3.0
     dev: true
 
+  /@uppy/companion-client/2.2.2:
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+    dependencies:
+      '@uppy/utils': 4.1.3
+      namespace-emitter: 2.0.1
+    dev: false
+
+  /@uppy/core/2.3.4:
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+    dependencies:
+      '@transloadit/prettier-bytes': 0.0.7
+      '@uppy/store-default': 2.1.1
+      '@uppy/utils': 4.1.3
+      lodash.throttle: 4.1.1
+      mime-match: 1.0.2
+      namespace-emitter: 2.0.1
+      nanoid: 3.3.4
+      preact: 10.11.3
+    dev: false
+
+  /@uppy/store-default/2.1.1:
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+    dev: false
+
+  /@uppy/utils/4.1.3:
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+    dependencies:
+      lodash.throttle: 4.1.1
+    dev: false
+
+  /@uppy/xhr-upload/2.1.3_@uppy+core@2.3.4:
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+    dependencies:
+      '@uppy/companion-client': 2.2.2
+      '@uppy/core': 2.3.4
+      '@uppy/utils': 4.1.3
+      nanoid: 3.3.4
+    dev: false
+
   /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44:
     resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1319,6 +1381,192 @@
       - '@vue/composition-api'
       - vue
 
+  /@wangeditor/basic-modules/1.1.7_j7icpicfeimtkldwmemjnpdjs4:
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      is-url: 1.2.4
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/code-highlight/1.0.3_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      prismjs: 1.29.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/core/1.1.19_qokc4m5r26t2nkvzejrgzroa7e:
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@types/event-emitter': 0.3.3
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      dom7: 3.0.0
+      event-emitter: 0.3.5
+      html-void-elements: 2.0.1
+      i18next: 20.6.1
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      scroll-into-view-if-needed: 2.2.31
+      slate: 0.72.8
+      slate-history: 0.66.0_slate@0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/editor-for-vue/5.1.12_jd77brrjgbuqi7h246utbcjone:
+    resolution: {integrity: sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.1.0'
+      vue: ^3.0.5
+    dependencies:
+      '@wangeditor/editor': 5.1.23
+      vue: 3.2.44
+    dev: false
+
+  /@wangeditor/editor/5.1.23:
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/code-highlight': 1.0.3_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      '@wangeditor/list-module': 1.0.5_tztyh2vh7kwzpeloifaekkk3my
+      '@wangeditor/table-module': 1.1.4_2dde2uzwslfxq2cqrl35sl4erm
+      '@wangeditor/upload-image-module': 1.0.2_dwqga4onuah5imhngzkgmw6t5a
+      '@wangeditor/video-module': 1.1.4_i6gxywmu7tvxmjxypclnjlcil4
+      dom7: 3.0.0
+      is-hotkey: 0.2.0
+      lodash.camelcase: 4.3.0
+      lodash.clonedeep: 4.5.0
+      lodash.debounce: 4.0.8
+      lodash.foreach: 4.5.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      lodash.toarray: 4.4.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/list-module/1.0.5_tztyh2vh7kwzpeloifaekkk3my:
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/table-module/1.1.4_2dde2uzwslfxq2cqrl35sl4erm:
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.isequal: 4.5.0
+      lodash.throttle: 4.1.1
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/upload-image-module/1.0.2_dwqga4onuah5imhngzkgmw6t5a:
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/basic-modules': 1.1.7_j7icpicfeimtkldwmemjnpdjs4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      lodash.foreach: 4.5.0
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
+  /@wangeditor/video-module/1.1.4_i6gxywmu7tvxmjxypclnjlcil4:
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+    dependencies:
+      '@uppy/core': 2.3.4
+      '@uppy/xhr-upload': 2.1.3_@uppy+core@2.3.4
+      '@wangeditor/core': 1.1.19_qokc4m5r26t2nkvzejrgzroa7e
+      dom7: 3.0.0
+      nanoid: 3.3.4
+      slate: 0.72.8
+      snabbdom: 3.5.1
+    dev: false
+
   /acorn-jsx/5.3.2_acorn@8.8.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -1780,7 +2028,7 @@
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /camelcase-keys/6.2.2:
@@ -1810,7 +2058,7 @@
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -1873,7 +2121,7 @@
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /character-entities-legacy/1.1.4:
@@ -2064,6 +2312,10 @@
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
+  /compute-scroll-into-view/1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+    dev: false
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -2102,7 +2354,7 @@
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case: 2.0.2
     dev: true
 
@@ -2259,6 +2511,13 @@
     resolution: {integrity: sha512-grTgbgjsRpvkYNjm8kmpvHHw/LkkS3SlQOOwgamhRZo7c5qQfts1QZdkJ6RP0K61BcxyH5siMz8qC/MDoW/tBA==}
     dev: true
 
+  /d/1.0.1:
+    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
+    dependencies:
+      es5-ext: 0.10.62
+      type: 1.2.0
+    dev: false
+
   /dashdash/1.14.1:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
@@ -2400,7 +2659,7 @@
     engines: {node: '>=10'}
     dependencies:
       globby: 11.1.0
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 2.2.0
       is-path-inside: 3.0.3
@@ -2462,6 +2721,12 @@
       entities: 4.4.0
     dev: true
 
+  /dom7/3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+    dependencies:
+      ssr-window: 3.0.0
+    dev: false
+
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -2517,7 +2782,7 @@
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /dotenv-expand/8.0.3:
@@ -2652,6 +2917,31 @@
       is-symbol: 1.0.4
     dev: true
 
+  /es5-ext/0.10.62:
+    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    engines: {node: '>=0.10'}
+    requiresBuild: true
+    dependencies:
+      es6-iterator: 2.0.3
+      es6-symbol: 3.1.3
+      next-tick: 1.1.0
+    dev: false
+
+  /es6-iterator/2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+      es6-symbol: 3.1.3
+    dev: false
+
+  /es6-symbol/3.1.3:
+    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    dependencies:
+      d: 1.0.1
+      ext: 1.7.0
+    dev: false
+
   /esbuild/0.11.3:
     resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==}
     hasBin: true
@@ -3105,6 +3395,13 @@
     engines: {node: '>= 0.6'}
     dev: true
 
+  /event-emitter/0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+    dependencies:
+      d: 1.0.1
+      es5-ext: 0.10.62
+    dev: false
+
   /eventemitter3/4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
@@ -3146,6 +3443,12 @@
       homedir-polyfill: 1.0.3
     dev: true
 
+  /ext/1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+    dependencies:
+      type: 2.7.2
+    dev: false
+
   /extend-shallow/2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
@@ -3771,7 +4074,7 @@
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /homedir-polyfill/1.0.3:
@@ -3822,6 +4125,10 @@
     engines: {node: '>=8'}
     dev: true
 
+  /html-void-elements/2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+    dev: false
+
   /htmlparser2/3.10.1:
     resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
     dependencies:
@@ -3890,6 +4197,12 @@
     engines: {node: '>=12.20.0'}
     dev: true
 
+  /i18next/20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+    dependencies:
+      '@babel/runtime': 7.20.6
+    dev: false
+
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -3919,6 +4232,10 @@
     hasBin: true
     dev: true
 
+  /immer/9.0.16:
+    resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==}
+    dev: false
+
   /immutable/4.1.0:
     resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==}
     dev: true
@@ -4169,6 +4486,10 @@
     resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
     dev: true
 
+  /is-hotkey/0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+    dev: false
+
   /is-interactive/1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -4236,7 +4557,6 @@
   /is-plain-object/5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /is-regex/1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
@@ -4314,6 +4634,10 @@
     engines: {node: '>=12'}
     dev: true
 
+  /is-url/1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+    dev: false
+
   /is-utf8/0.2.1:
     resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
     dev: true
@@ -4625,7 +4949,7 @@
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
@@ -4663,14 +4987,42 @@
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash.camelcase/4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+    dev: false
+
+  /lodash.clonedeep/4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: false
+
+  /lodash.foreach/4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: true
 
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
+
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
+  /lodash.throttle/4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+    dev: false
+
+  /lodash.toarray/4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+    dev: false
+
   /lodash.truncate/4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
@@ -4708,7 +5060,7 @@
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /lru-cache/6.0.0:
@@ -4868,6 +5220,12 @@
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  /mime-match/1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+    dependencies:
+      wildcard: 1.1.2
+    dev: false
+
   /mime-types/2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
@@ -4987,6 +5345,10 @@
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
+  /namespace-emitter/2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+    dev: false
+
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -5043,6 +5405,10 @@
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
     dev: true
 
+  /next-tick/1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+    dev: false
+
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
@@ -5051,7 +5417,7 @@
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /node-bitmap/0.0.1:
@@ -5367,7 +5733,7 @@
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /parent-module/1.0.1:
@@ -5440,7 +5806,7 @@
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /pascalcase/0.1.1:
@@ -5456,7 +5822,7 @@
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /path-exists/4.0.0:
@@ -5745,11 +6111,20 @@
       posthtml-render: 1.4.0
     dev: true
 
+  /preact/10.11.3:
+    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+    dev: false
+
   /prelude-ls/1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
+  /prismjs/1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /process-nextick-args/1.0.7:
     resolution: {integrity: sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==}
     dev: true
@@ -5907,6 +6282,10 @@
       strip-indent: 3.0.0
     dev: true
 
+  /regenerator-runtime/0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: false
+
   /regex-not/1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -6081,7 +6460,7 @@
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -6138,6 +6517,12 @@
       through: 2.3.8
     dev: true
 
+  /scroll-into-view-if-needed/2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+    dependencies:
+      compute-scroll-into-view: 1.0.20
+    dev: false
+
   /scule/0.3.2:
     resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==}
     dev: true
@@ -6173,7 +6558,7 @@
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -6246,6 +6631,23 @@
     engines: {node: '>=12'}
     dev: true
 
+  /slate-history/0.66.0_slate@0.72.8:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+    dependencies:
+      is-plain-object: 5.0.0
+      slate: 0.72.8
+    dev: false
+
+  /slate/0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+    dependencies:
+      immer: 9.0.16
+      is-plain-object: 5.0.0
+      tiny-warning: 1.0.3
+    dev: false
+
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -6272,11 +6674,16 @@
       is-fullwidth-code-point: 4.0.0
     dev: true
 
+  /snabbdom/3.5.1:
+    resolution: {integrity: sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==}
+    engines: {node: '>=8.3.0'}
+    dev: false
+
   /snake-case/3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /snapdragon-node/2.1.1:
@@ -6428,6 +6835,10 @@
       tweetnacl: 0.14.5
     dev: true
 
+  /ssr-window/3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+    dev: false
+
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -6855,6 +7266,10 @@
       xtend: 4.0.2
     dev: true
 
+  /tiny-warning/1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false
+
   /tinymce/6.2.0:
     resolution: {integrity: sha512-zLjbFrg0hbtJ6PxmZUjQY6zyIOM/mLrWGTvhBec7XwYwoW1E0xXMQzy2tgMTh3OvJpsclgqf2ZMjmwcv4Cludw==}
     dev: false
@@ -6862,7 +7277,7 @@
   /title-case/3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /tmp/0.0.33:
@@ -6938,10 +7353,6 @@
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
-
   /tsutils/3.21.0_typescript@4.8.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7010,6 +7421,14 @@
     engines: {node: '>=8'}
     dev: true
 
+  /type/1.2.0:
+    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
+    dev: false
+
+  /type/2.7.2:
+    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    dev: false
+
   /typedarray/0.0.7:
     resolution: {integrity: sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==}
     dev: true
@@ -7189,13 +7608,13 @@
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: registry.npmmirror.com/tslib/2.4.0
     dev: true
 
   /uri-js/4.4.1:
@@ -7267,7 +7686,7 @@
     resolution: {integrity: sha512-i1CGRaiDs3qJ+Yc8cgtOnrZOwlhY02oDBrWSBKD9uYSsxqQG1RhNXLmR/orke0ye0sbKpVtAUHwhF2rs9A46cQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10
+      graceful-fs: 4.2.10
       strip-bom: 2.0.0
       strip-bom-stream: 1.0.0
       vinyl: 1.2.0
@@ -7596,6 +8015,10 @@
       isexe: 2.0.0
     dev: true
 
+  /wildcard/1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+    dev: false
+
   /wmf/1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
@@ -7827,6 +8250,15 @@
     version: 1.11.6
     dev: false
 
+  registry.npmmirror.com/echarts/5.4.1:
+    resolution: {integrity: sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz}
+    name: echarts
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+      zrender: registry.npmmirror.com/zrender/5.4.1
+    dev: false
+
   registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44:
     resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.2.26.tgz}
     id: registry.npmmirror.com/element-plus/2.2.26
@@ -8095,7 +8527,9 @@
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz}
     name: graceful-fs
     version: 4.2.10
+    requiresBuild: true
     dev: true
+    optional: true
 
   registry.npmmirror.com/jsencrypt/3.3.1:
     resolution: {integrity: sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz}
@@ -8142,6 +8576,18 @@
     version: 1.2.0
     dev: false
 
+  registry.npmmirror.com/tslib/2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz}
+    name: tslib
+    version: 2.3.0
+    dev: false
+
+  registry.npmmirror.com/tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz}
+    name: tslib
+    version: 2.4.0
+    dev: true
+
   registry.npmmirror.com/uglify-js/3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/uglify-js/-/uglify-js-3.17.4.tgz}
     name: uglify-js
@@ -8169,3 +8615,11 @@
     dependencies:
       vue: 3.2.44
     dev: false
+
+  registry.npmmirror.com/zrender/5.4.1:
+    resolution: {integrity: sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz}
+    name: zrender
+    version: 5.4.1
+    dependencies:
+      tslib: registry.npmmirror.com/tslib/2.3.0
+    dev: false
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index b5ef49d..8bfe87e 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -50,3 +50,76 @@
     responseType: 'blob',
   })
 }
+// 导入计量人员
+export function uploadList(data: FormData) {
+  return request({
+    url: '/staff/batchImportStaff',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录列表
+export function getCertificateList(data: StaffListType) {
+  return request({
+    url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导出
+export function CertificateListList(data: object) {
+  return request({
+    url: '/certificate/exportCertificateList',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
+// 证书记录新增
+export function addCertificateList(data: object) {
+  return request({
+    url: '/certificate/addStaffCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 获取证书记录详情
+export function getCertificateDetail(data: object) {
+  return request({
+    url: '/certificate/queryStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录更新
+export function getCertificateUpdate(data: object) {
+  return request({
+    url: '/certificate/updateStaffCertificateInfo',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录导入
+export function getCertificateUpload(data: FormData) {
+  return request({
+    url: '/certificate/batchImportCertificate',
+    method: 'post',
+    data,
+  })
+}
+// 证书过期提醒
+export function getCertificateRemind(data: object) {
+  return request({
+    url: '/certificate/expirationReminder',
+    method: 'post',
+    data,
+  })
+}
+// 证书记录删除
+export function getCertificateRemove(data: object) {
+  return request({
+    url: '/certificate/deleteCertificate',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/bench.ts b/src/api/system/bench.ts
new file mode 100644
index 0000000..705ca3a
--- /dev/null
+++ b/src/api/system/bench.ts
@@ -0,0 +1,32 @@
+import request from '../index'
+const prefix = '/workbench'
+// 培训计划统计
+export function getStatistic() {
+  return request({
+    url: `${prefix}/meterTrainStatistic`,
+    method: 'post',
+  })
+}
+// 计量人员统计
+export function getStaffSStatistic() {
+  return request({
+    url: `${prefix}/meterStaffStatistic`,
+    method: 'post',
+  })
+}
+// 培训考核统计
+export function getTrainLogSStatistic(data: object) {
+  return request({
+    url: `${prefix}/meterTrainLogStatistic`,
+    method: 'post',
+    data,
+  })
+}
+// 我的证书记录
+export function getCertificateStatistic(data: object) {
+  return request({
+    url: `${prefix}/queryStaffCertificate`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/price.ts b/src/api/system/price.ts
new file mode 100644
index 0000000..ddee1a1
--- /dev/null
+++ b/src/api/system/price.ts
@@ -0,0 +1,62 @@
+import request from '../index'
+const prefix = '/price'
+
+// 价格列表查询
+export function getPriceList(data: object) {
+  return request({
+    url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 价格列表新增
+export function getPriceAddList(data: object) {
+  return request({
+    url: `${prefix}/addMeterPrice`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取下拉框
+export function getTypeSelect(code: string) {
+  return request({
+    url: `/sys/dict/code/${code}`,
+    method: 'get',
+  })
+}
+
+// 获取详情信息
+export function getQueryPriceInfo(data: object) {
+  return request({
+    url: `${prefix}/queryPriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改编辑
+export function getUpdatePriceInfo(data: object) {
+  return request({
+    url: `${prefix}/updatePriceInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 删除列表
+export function getDeletePrice(data: object) {
+  return request({
+    url: `${prefix}/deletePrice`,
+    method: 'post',
+    data,
+  })
+}
+// 上传文件
+export function uploadPrice(data: FormData) {
+  return request({
+    url: `${prefix}/batchImportPrice`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 6cf7c23..1798ce5 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -54,7 +54,7 @@
 // 签名/签章列表/详情
 export function listPageDetailApi(data: object) {
   return request({
-    url: `${prefix}sign/listPage`,
+    url: `${prefix}sign/detail`,
     method: 'post',
     data,
   })
@@ -87,7 +87,7 @@
 // 原始记录模板/证书报告模板列表/详情（
 export function templatePageDetail(data: object) {
   return request({
-    url: `${prefix}/template/listPage`,
+    url: `${prefix}/template/detail`,
     method: 'post',
     data,
   })
@@ -125,3 +125,10 @@
     responseType: 'blob',
   })
 }
+// 获取图片地址
+export function getPhotoUrl(fileName: string) {
+  return request({
+    url: `/minio/file/url?fileName=${fileName}`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/images/bench/1671087276259.jpg b/src/assets/images/bench/1671087276259.jpg
new file mode 100644
index 0000000..34b76f5
--- /dev/null
+++ b/src/assets/images/bench/1671087276259.jpg
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index d959c68..8b37b44 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -18,6 +18,7 @@
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
+    Echarts: typeof import('./components/echarts/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./components/dialog/employeesRoleDialog.vue')['default']
@@ -33,6 +34,7 @@
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
+    Pie: typeof import('./components/echarts/pie.vue')['default']
     PromoterDrawer: typeof import('./components/drawer/promoterDrawer.vue')['default']
     RoleDialog: typeof import('./components/dialog/roleDialog.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/echarts/index.vue b/src/components/echarts/index.vue
new file mode 100644
index 0000000..1f6f6aa
--- /dev/null
+++ b/src/components/echarts/index.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  xAxisData: () => [],
+  yAxisData: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  xAxisData: string[]
+  yAxisData: number[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      visualMap: [
+        {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400,
+        },
+      ],
+      color: ['#000'],
+      legend: {
+        data: [props.title],
+        itemHeight: 10, // 圆点大小
+        itemWidth: 0, // 线的长度
+        x: 'right', // 居右显示
+        y: -2,
+        textStyle: { // 图例文字的样式
+          color: '#000',
+          fontSize: 12,
+        },
+      },
+      tooltip: {
+        trigger: 'axis',
+        textStyle: {
+          fontSize: '13',
+        },
+        axisPointer: {
+          type: 'cross',
+          label: {
+            fontSize: '13',
+          },
+        },
+      },
+      xAxis: [
+        {
+          boundaryGap: false,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: false,
+          },
+          splitLine: {
+            show: true,
+          },
+          data: props.yAxisData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          boundaryGap: true,
+          axisLabel: {
+            fontSize: 12,
+            color: '#000',
+          },
+          axisLine: {
+            show: true,
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+      ],
+      grid: {
+        left: 10,
+        right: 30,
+        bottom: 60,
+        top: 20,
+        containLabel: true,
+      },
+      series: [
+
+        {
+          name: props.title,
+          type: 'line',
+          smooth: true,
+          data: props.xAxisData,
+          symbol: 'circle', // 拐点样式
+          symbolSize: 2, // 拐点大小
+          // 折线条的样式
+          lineStyle: {
+            color: '#58abf0',
+          },
+          // 折线拐点的样式
+          itemStyle: {
+            normal: {
+              // 静止时：
+              color: 'rgb(40 184 228)',
+              borderColor: 'rgb(40 184 228)', // 拐点的边框颜色
+              borderWidth: 4,
+            },
+            emphasis: {
+              // 鼠标经过时：
+              color: 'rgb(40 184 228)',
+            },
+          },
+          areaStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: '#60b4f1',
+              },
+              {
+                offset: 1,
+                color: '#fff',
+              },
+            ]),
+          },
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.xAxisData, props.yAxisData], ([newName, newNums], [oldName, oldNums]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..3ad8db6
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,100 @@
+<script lang="ts" setup>
+import { nextTick, reactive, ref } from 'vue'
+import * as echarts from 'echarts'
+const props = withDefaults(defineProps<Props>(), {
+  id: '',
+  data: () => [],
+  title: '',
+})
+// const props = withDefaults(defineProps<Props>(), {})
+const person: any = reactive({
+  markList: [],
+})
+interface Props {
+  id: string
+  data: string[]
+  title: string
+}
+const GetEchar = () => {
+  const myChart = ref<HTMLElement>()
+  const myCharts = ref<any>()
+  nextTick(() => {
+    const chartDom = document.getElementById(props.id)!
+    myCharts.value = echarts.init(chartDom)
+    const option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      color: ['rgb(40, 184, 228)', '#ccc'],
+      legend: {
+        orient: 'vertical',
+        right: '0',
+        bottom: '50%',
+        itemGap: 20,
+      },
+      graphic: {
+        type: 'text',
+        left: 'center',
+        top: '45%',
+        style: {
+          text: props.title,
+          textAlign: 'center',
+          fill: '#333',
+          fontSize: 18,
+        },
+      },
+      series: [
+        {
+          name: '培训考核',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderColor: '#fff',
+            borderWidth: 0,
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 20,
+              fontWeight: 'bold',
+            },
+          },
+          label: {
+            normal: {
+              show: false,
+              position: 'center',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: props.data,
+        },
+      ],
+    }
+    myCharts.value.setOption(option)
+    // 让图表跟随屏幕自动的去适应
+    window.addEventListener('resize', () => {
+      myCharts.value.resize()
+    })
+  })
+}
+watch(
+  [() => props.data], ([newName], [oldName]) => {
+    GetEchar()
+  }, { immediate: true, deep: true })
+GetEchar()
+</script>
+
+<template>
+  <div :id="props.id" class="bars_w" />
+</template>
+
+<style lang="scss" scoped>
+.bars_w {
+  width: 100%;
+  height: 90%;
+  transform: translateX(-25%);
+}
+</style>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index adf4bb1..c8465cc 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,5 +1,314 @@
+<script lang="ts" setup name="bench">
+import { ref } from 'vue'
+import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
+import { getPlanList } from '@/api/system/plan'
+import { listPageApi } from '@/api/measure/file'
+import Echarts from '@/components/echarts/index.vue'
+import EchartsPie from '@/components/echarts/pie.vue'
+const buttomTypes = ref([
+  { id: '1', text: '培训记录', url: '/train/trainLog' },
+  { id: '2', text: '证书到期提醒', url: '/person/remind' },
+  { id: '3', text: '溯源供方', url: '/source/list' },
+  { id: '4', text: '实验室', url: '/measureDept/ks' },
+  { id: '5', text: '工程组', url: '/measureDept/gcz' },
+  { id: '6', text: '计量人员', url: '/person/list' },
+])
+const tableData = ref([])
+const meterageTableData = ref([])
+const columns = ref([
+  { text: '培训名称', value: 'planName', width: '120' },
+  { text: '负责人', value: 'director', width: '130' },
+  { text: '培训时间', value: 'trainTime' },
+])
+const meterageColumns = ref([
+  { text: '文件名称', value: 'fileName', width: '120' },
+  { text: '类别', value: 'fileTypeName', width: '120' },
+  { text: '发布时间', value: 'publishTime' },
+])
+const CertificateColumns = ref([
+  { text: '证书名称', value: 'certificateName', width: '120' },
+  { text: '到期时间', value: 'validDate' },
+])
+const StatisticyAxis = ref([])
+const StatisticXAxis = ref([])
+const StaffSStatisticyAxis = ref([])
+const StaffSStatisticxAxis = ref([])
+const TrainLogSList = ref([])
+const TrainLogTitle = ref('')
+const CertificateList = ref([])
+const CertificateObject = ref({})
+const getStatisticList = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+    offset: 1,
+    limit: 10000,
+  }
+  getPlanList(params).then((res) => {
+    tableData.value = res.data.rows
+  })
+  getStatistic().then(async (res) => {
+    StatisticyAxis.value = await res.data.map((item) => {
+      return item.date
+    })
+    StatisticXAxis.value = await res.data.map((item) => {
+      return Number(item.count)
+    })
+  })
+  getStaffSStatistic().then(async (res) => {
+    StaffSStatisticyAxis.value = await res.data.map(item => item.date)
+    StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
+  })
+  const param = {
+    account: localStorage.getItem('login_username'),
+  }
+  getTrainLogSStatistic(param).then((res) => {
+    TrainLogSList.value = [
+      { name: `合格     ${res.data.qualified}--${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
+      { name: `不合格   ${res.data.notQualified}-- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+    ]
+    TrainLogTitle.value = res.data.trainCount
+  })
+  getCertificateStatistic(param).then((res) => {
+    CertificateList.value = res.data
+    CertificateObject.value = res.data.sort((nex, max) => {
+      return nex.lastValidDate - max.lastValidDate
+    })[0]
+  })
+}
+const getmeterageList = () => {
+  const params = {
+    fileNo: '', // 编号
+    fileName: '', // 名称
+    publishTime: '', // 发布时间
+    fileCode: '', // 文件号
+    effectiveTime: '', // 实施时间
+    effectiveStatus: '', // 实施状态
+    limit: 10,
+    offset: 1,
+    fileType: '', // 类型
+  }
+  listPageApi(params).then((res) => {
+    meterageTableData.value = res.data.rows
+  })
+}
+getmeterageList()
+getStatisticList()
+</script>
+
 <template>
-  <view>
-    工作台
-  </view>
+  <app-container>
+    <div class="bench">
+      <div class="bench-left">
+        <div class="bench-left-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/train/plan')">更多 ></span>
+          </div>
+          <el-table :data="tableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+        <div class="bench-left-buttom">
+          <div class="bench-title">
+            <h3>计量文件</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/file/quality')">更多 ></span>
+          </div>
+          <el-table :data="meterageTableData" style="width: 100%;height: 80%; border-radius: 10px;">
+            <el-table-column v-for="item in meterageColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+          </el-table>
+        </div>
+      </div>
+      <div class="bench-center">
+        <div class="bench-center-top">
+          <div class="bench-title">
+            <h3>培训计划</h3>
+          </div>
+          <echarts :id="Math.random()" title="培训计划" :x-axis-data="StatisticXAxis" :y-axis-data="StatisticyAxis" />
+        </div>
+        <div class="bench-center-buttom">
+          <div class="bench-title">
+            <h3>我的证书</h3>
+            <span style="cursor: pointer;color: #ccc;" @click="$router.push('/person/certificateLog')">更多 ></span>
+          </div>
+          <div class="bench-center-content">
+            <el-table :data="CertificateList" style="width: 100%;height: 100%; border-radius: 10px;">
+              <el-table-column v-for="item in CertificateColumns" :key="item.value" :prop="item.value" align="center" :label="item.text" :width="item.width" />
+            </el-table>
+            <div class="validDate">
+              <div class="validDate-top" />
+              <div class="validDate-bottom">
+                最近到期时间 <br>
+                <span>{{ CertificateObject.validDate }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bench-right">
+        <div class="bench-right-top">
+          <div v-for="item in buttomTypes" :key="item.id" class="right-top-box" @click="$router.push(item.url)">
+            {{ item.text }}
+          </div>
+        </div>
+        <div class="bench-right-center">
+          <div class="bench-title">
+            <h3>我的培训考核</h3>
+          </div>
+          <echarts-pie :id="Math.random()" :data="TrainLogSList" :title="TrainLogTitle" />
+        </div>
+        <div class="bench-right-buttom">
+          <div class="bench-title">
+            <h3>计量人员</h3>
+          </div>
+          <echarts :id="Math.random()" title="人数" :x-axis-data="StaffSStatisticxAxis" :y-axis-data="StaffSStatisticyAxis" />
+        </div>
+      </div>
+    </div>
+  </app-container>
 </template>
+
+<style lang="scss" scoped>
+.bench {
+  display: flex;
+
+  .bench-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 1vw;
+    height: 20%;
+  }
+
+  .bench-left {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 32%;
+    height: 90vh;
+
+    .bench-left-top {
+      height: 48%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+    }
+
+    .bench-left-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+    }
+  }
+
+  .bench-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-center-top {
+      height: 45%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      padding: 10px;
+    }
+
+    .bench-center-buttom {
+      height: 48%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+
+      .validDate {
+        width: 50%;
+        height: 100%;
+        padding: 20px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+
+        .validDate-top {
+          width: 100px;
+          height: 100px;
+          margin-bottom: 30px;
+          background: url("../../../assets/images/bench/1671087276259.jpg") no-repeat center / cover;
+        }
+
+        .validDate-bottom {
+          font-size: 18px;
+          font-weight: 600;
+        }
+
+        .validDate-bottom span {
+          font-size: 14px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .bench-center-content {
+        height: 80%;
+        display: flex;
+        align-items: center;
+        justify-content: space-around;
+      }
+    }
+  }
+
+  .bench-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 35%;
+    height: 90vh;
+
+    .bench-right-top {
+      height: 30%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 5%;
+      margin: 2%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      justify-content: space-around;
+
+      .right-top-box {
+        width: 29%;
+        margin: 1%;
+        height: 40%;
+        border-radius: 5px;
+        text-align: center;
+        line-height: 8vh;
+        color: #fff;
+        cursor: pointer;
+        background-color: rgb(40 184 228);
+      }
+    }
+
+    .bench-right-center {
+      height: 34%;
+      background-color: #fff;
+      border-radius: 10px;
+      margin: 2%;
+      overflow: hidden;
+    }
+
+    .bench-right-buttom {
+      height: 30%;
+      margin: 2%;
+      background-color: #fff;
+      border-radius: 10px;
+      padding: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/approve.vue b/src/views/measure/file/approve.vue
index b410767..032708e 100644
--- a/src/views/measure/file/approve.vue
+++ b/src/views/measure/file/approve.vue
@@ -48,7 +48,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 3ba91e3..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -1,6 +1,6 @@
 <!-- 新增或详情弹窗 -->
 <script lang="ts" setup name="addNotice">
-import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, FormRules, UploadProps, UploadRequestHandler, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { deptType } from '../file-interface'
@@ -9,9 +9,15 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile, addApi } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -29,14 +35,10 @@
   createUserId: '', // 创建人id
   id: '',
 }) // 表单
-const fileTypeName = ref('')
-const effectiveStatusName = ref('')
-const title = ref('')
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
   publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
   publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
   effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
   createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
   fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
@@ -58,22 +60,71 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
+  title.value = row.title
+  // effectiveStatusName.value = ''
+  fileList.value = []
   getuser()
+  getuser()
+  getPubList()
   if (row.title === '新增') {
-    getuser()
-    getPubList()
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
     ruleForm.publisher = userInfo.$state.deptId
+    // 判断有无存储
+    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
+    if (sessionStorage.getItem(fileTypeName.value)) {
+      const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
+      ruleForm.fileType = session.fileType
+      ruleForm.fileName = session.fileName
+      ruleForm.fileCode = session.fileCode
+      ruleForm.minioFileName = session.minioFileName
+      ruleForm.publishTime = session.publishTime
+      ruleForm.remark = session.remark
+      ruleForm.publishTime = session.publishTime
+      ruleForm.effectiveTime = session.effectiveTime
+      ruleForm.effectiveStatus = session.effectiveStatus
+      ruleForm.publishTime = session.publishTime
+      ruleForm.createUserId = session.createUserId
+      if (ruleForm.minioFileName) {
+        fileList.value.push({
+          name: ruleForm.minioFileName,
+          url: '',
+        })
+      }
+    }
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
   }
 }
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  emits('resetData')
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
@@ -95,13 +146,22 @@
               formEl?.resetFields()
               ElMessage.success('提交成功')
               emits('resetData')
+              if (sessionStorage.getItem(fileTypeName.value)) {
+                sessionStorage.removeItem(fileTypeName.value)
+              }
+              close()
+              dialogVisible.value = false
             }
           })
         }
         else {
           // 保存
-          // 暂时未写
+          sessionStorage.setItem(fileTypeName.value, JSON.stringify(ruleForm))
           ElMessage.success('保存成功')
+          formEl?.resetFields()
+          emits('resetData')
+          close()
+          dialogVisible.value = false
         }
       })
     }
@@ -110,37 +170,35 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
+  close()
+  dialogVisible.value = false
   emits('resetData')
 }
-const fileList = ref<UploadUserFile[]>([])
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  // console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: res.data.fileName,
-      //   url: res.data.fileId,
-      //   // type: file.file.type,
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -151,14 +209,17 @@
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
   if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '已废止'
     ruleForm.effectiveStatus = '3'
   }
   else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
     effectiveStatusName.value = '在使用'
     ruleForm.effectiveStatus = '1'
   }
   else {
+    // ruleForm.effectiveStatusName = '未使用'
     effectiveStatusName.value = '未使用'
     ruleForm.effectiveStatus = '2'
   }
@@ -166,17 +227,17 @@
 </script>
 
 <template>
-  <app-container style="overflow: hidden;">
+  <app-container v-if="dialogVisible" style="overflow: hidden;">
     <div class="body-container">
       <div class="header">
         <div class="title">
-          新建{{ fileTypeName }}
+          {{ fileTypeName }}-{{ title }}
         </div>
         <span class="btns">
-          <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
             提交
           </el-button>
-          <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '保存')">
             保存
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -188,7 +249,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="系统编号" prop="fileNo">
-              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统编号" disabled />
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -198,7 +259,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
-              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" />
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -218,7 +279,7 @@
           <el-col :span="6">
             <el-form-item label="实施时间" prop="effectiveTime">
               <el-date-picker
-                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
               />
@@ -234,7 +295,7 @@
           <el-col :span="6">
             <el-form-item label="创建时间" prop="publishTime">
               <el-date-picker
-                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
               />
@@ -251,14 +312,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
                 :http-request="uploadQuarterlyEvaluateFile"
@@ -269,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -309,7 +377,7 @@
 }
 
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .isDetail {
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 7b54fb0..c0e4c86 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -290,7 +290,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
             class="normal-date"
             style="width: 130px;"
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 71b5d8b..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -28,13 +33,12 @@
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileTypeName', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
 ]) // 表格
 const printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -100,21 +104,17 @@
 }
 // 详情
 const detail = (row: fileListType) => {
+  dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
     fileType: searchQuery.fileType,
-    fileTypeName: props.name,
     title: '详情',
+    fileTypeName: props.name,
   })
 }
 // 下载(单个)
 const exportSelf = (row: fileListType) => {
-  exportExcel({
-    json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-    name: props.name,
-    titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-    sheetName: 'sheet1',
-  })
+
 }
 // 废止
 const abolish = (row: fileListType) => {
@@ -265,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -276,48 +276,49 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 130px;"
+            style="width: 155px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select>
+          </el-select> -->
+          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -325,6 +326,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -337,18 +339,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" type="primary" link @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -362,15 +364,15 @@
 
 <style lang="scss" scoped>
 .normal-input {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-date {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 .normal-select {
-  width: 130px !important;
+  width: 154px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 1b5fffe..41db38e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -45,7 +45,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 67px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index c23b993..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -20,7 +22,12 @@
   remark: '', // 备注
 }) // 表单
 const title = ref('')
-const rules = ref<FormRules>({}) // 表单验证规则
+const rules = ref<FormRules>({
+  organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
+  technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
+}) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
@@ -72,8 +79,26 @@
   formEl?.resetFields()
   emits('resetData')
 }
+// 重置
+const reset = () => {
+  ruleForm.value.organizeType = '' // 类型
+  ruleForm.value.organizeName = '' // 名称
+  ruleForm.value.organizeNo = '' // 编号
+  ruleForm.value.deptId = '' // 部门
+  ruleForm.value.director = '' // 负责人
+  ruleForm.value.administrationJob = '' // 行政职务
+  ruleForm.value.technologyJob = '' // 技术职务
+  ruleForm.value.remark = '' // 备注
+}
+const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -82,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -108,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -137,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -226,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -313,40 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
+  reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -360,26 +440,15 @@
   // 不同组织来判断展示的列表
   if (title.value.split('-')[1] === '部门') {
     changeList.value = changeList_bm.value
+    current.value = changeList_bm.value[0].name
   }
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
+    current.value = changeList_ks.value[0].name
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
-  }
-  current.value = changeList_bm.value[0].name
-
-  // 根据是否详情来判断 表单验证是否生效
-  if (title.value.split('-')[2] !== '详情') {
-    rules.value = {
-      organizeName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-      director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-      administrationJob: [{ required: true, message: '行政职务不能为空', trigger: 'blur' }],
-      technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
-    }
-  }
-  else {
-    rules.value = {}
+    current.value = changeList_gcz.value[0].name
   }
 }
 defineExpose({ initDialog })
@@ -401,7 +470,7 @@
           </el-button>
         </span>
       </div>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
@@ -418,21 +487,21 @@
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
               <el-select v-model="ruleForm.director" placeholder="负责人" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
               <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="administrationJob">
               <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title.split('-')[2] === '详情'">
-                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -467,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
@@ -519,7 +593,17 @@
   }
 }
 
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
 .marg {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d4f7b42..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -1,7 +1,7 @@
 <!-- 计量组织公共模板 -->
 <script lang="ts" setup>
 import { ElLoading } from 'element-plus'
-import type { searchQueryType } from '../measureDept-interface'
+import type { rowType, searchQueryType } from '../measureDept-interface'
 import addDialog from './addDialog.vue'
 import type { fileResType } from '@/views/measure/file/file-interface'
 import { exportApi, listPageApi } from '@/api/measure/measureDept'
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -124,7 +139,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -132,7 +147,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: rowType) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     ...row,
@@ -201,14 +216,14 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
-            v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
           />
         </search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -227,6 +242,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -239,12 +255,12 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index dfdb50f..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
@@ -21,3 +21,24 @@
   data: any[]
   column: columnType[]
 }
+// 部门返回值对象类型
+export interface rowType {
+  administrationJob: string
+  administrationJobName: string
+  createTime: string
+  deptId: string
+  director: string
+  id: string
+  isDel: number
+  meterMajor: string
+  organizeName: string
+  organizeNo: string
+  organizeType: string
+  pDeptId: string
+  phone: string
+  remark: string
+  technologyJob: string
+  technologyJobName: string
+  updateTime: string
+  title?: string
+}
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index d85b082..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,3 +1,367 @@
+<!-- 证书记录 -->
+<script lang="ts" setup name="person">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import addDialog from './components/addRecord.vue'
+import type { StaffListType, StaffType } from './person-interface'
+import { CertificateListList, getCertificateList, getCertificateRemind, getCertificateRemove, getCertificateUpload } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const props = defineProps({
+  isRemind: {
+    type: Boolean,
+    default: false,
+  },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive<StaffListType>({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 工作部门
+  // major: '', // 计量专业
+  verifierCertificateNo: '', // 证书号
+  certificateStatus: '', // 证书状态
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
+  { text: '姓名', value: 'name', align: 'center', width: '80' },
+  { text: '性别', value: 'sex', align: 'center', width: '55' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
+  { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
+  { text: '证书号', value: 'certificateNo', align: 'center', width: '150' },
+  { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
+  { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
+]) // 表格
+const certificateStatusList = ref([
+  {
+    name: '全部',
+    id: 'status01',
+    value: '',
+  },
+  {
+    name: '已失效',
+    id: 'status02',
+    value: '1',
+  },
+  {
+    name: '正常',
+    id: 'status02',
+    value: '0',
+  },
+])
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '计量人员列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取所有部门
+const deptList = ref<DeptTreeNode[]>([])
+const getDeptList = async () => {
+  getDeptTreeList().then((res) => {
+    deptList.value = res.data
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getCertificateList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '详情',
+  })
+}
+// 编辑
+const update = (row: StaffType) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+
+// 删除
+const remove = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getCertificateRemove({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 提醒
+const remind = (row: StaffType) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.name}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getCertificateRemind({ id: row.id }).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          type: 'success',
+          message: '操作成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  searchQuery.staffNo = ''
+  searchQuery.name = ''
+  searchQuery.deptId = ''
+  searchQuery.certificateStatus = ''
+  searchQuery.verifierCertificateNo = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 新增
+const add = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  CertificateListList({ ...searchQuery }).then((res) => {
+    exportFile(res.data, '证书记录列表')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传图片
+  // console.log(event.target.files)
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    getCertificateUpload(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+//   }
+//   else {
+//     ElMessage.error('请上传pdf格式')
+//   }
+}
+// 批量导入
+const batchImport = () => {
+  fileRef.value.click()
+}
+// 传给子组件的刷新事件
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getDeptList()
+  getList()
+})
+</script>
+
 <template>
-  <div>证书记录</div>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.staffNo" placeholder="人员编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+            <el-option
+              v-for="item in certificateStatusList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :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 fixed="right" label="操作" align="center" width="150">
+              <template #default="{ row }">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
+                  提醒
+                </el-button>
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
+                  详情
+                </el-button>
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 18f379d..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -3,9 +3,9 @@
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import type { technologyJobType } from '../person-interface'
 import certificateAddDialog from './certificateAddDialog.vue'
 import userListDialog from './userListDialog.vue'
-import type { deptType } from '@/views/measure/file/file-interface'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { UploadFile } from '@/api/measure/file'
@@ -14,9 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+// import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -98,7 +101,7 @@
     sexList.value = response.data
   })
 }
-const educationList = ref([])
+const educationList = ref<technologyJobType[]>([])
 // 获取文化程度列表
 const geteducationList = () => {
   getDictByCode('education').then((response) => {
@@ -128,14 +131,14 @@
 
   }
 }
-const technologyJobList = ref([])
+const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
   getDictByCode('technologyJob').then((response) => {
     technologyJobList.value = response.data
   })
 }
-const administrationJobList = ref([])
+const administrationJobList = ref<technologyJobType[]>([])
 // 获取行政职务列表
 const getAdministrationJob = () => {
   getDictByCode('administrationJob').then((response) => {
@@ -150,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -177,7 +182,7 @@
 const changeList = ref([
   {
     name: '证书基本信息',
-    data: [],
+    data: [] as any[],
     column: [
       {
         label: '发证单位',
@@ -222,15 +227,41 @@
   return changeList.value.filter(item => item.name === current.value)[0]
 })
 const certificateRef = ref() // 添加证书信息弹窗
+const currenSelect = ref<number>(-1) // 当前选中行
 // 添加行
 const addRow = () => {
-  certificateRef.value.initDialog()
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  if (currenSelect.value >= 0) {
+    const row: object = changeList.value[0].data.filter((item, index) => index === currenSelect.value)[0]
+    certificateRef.value.initDialog({ ...row, title: '编辑' })
+  }
+  else {
+    ElMessage.warning('请先选择需要编辑的数据')
+  }
 }
 // 证书信息行内添加数据
-const addRowcertificate = (row: any) => {
-  changeList.value[0].data.push(row)
+const addRowcertificate = (row: any, _: string) => {
+  if (_ === 'update') {
+    changeList.value[0].data = changeList.value[0].data.map((item, index) => {
+      if (index === currenSelect.value) {
+        return {
+          ...item,
+          ...row,
+        }
+      }
+      else {
+        return item
+      }
+    })
+  }
+  else {
+    changeList.value[0].data.push(row)
+  }
 }
-const currenSelect = ref<number>(-1) // 当前选中行
+
 // 删除行
 const removeRow = () => {
   console.log(currenSelect.value)
@@ -318,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -348,7 +388,8 @@
                 style="margin-left: 50px;"
                 :disabled="title === '详情'"
               >
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
@@ -467,12 +508,15 @@
           {{ current }}
         </div>
         <span class="btns">
-          <el-button type="info" :disabled="title === '详情'" @click="removeRow">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
             删除行
           </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
             添加行
           </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
         </span>
       </div>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
new file mode 100644
index 0000000..2928870
--- /dev/null
+++ b/src/views/measure/person/components/addRecord.vue
@@ -0,0 +1,516 @@
+<!-- 计量人员新增 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <div class="header">
+        <div class="title">
+          证书记录-{{ title }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+            完成
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </span>
+      </div>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-input v-if="title === '详情'" v-model.trim="meterStaff.deptId" placeholder="" :disabled="title === '详情'" />
+              <com-tree-select
+                v-else
+                v-model="meterStaff.deptId" :options="PubList" placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="header" style="margin-top: 10px;">
+        <div class="title">
+          {{ current }}
+        </div>
+        <span class="btns">
+          <el-button v-if="title === '新建'" type="info" @click="removeRow">
+            删除行
+          </el-button>
+          <el-button v-if="title === '新建'" type="primary" @click="addRow">
+            添加行
+          </el-button>
+          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+            编辑行
+          </el-button>
+        </span>
+      </div>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </div>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.body-container {
+  .form {
+    background-color: #fff;
+    border-radius: 8px;
+    padding-top: 10px;
+    margin-top: 10px;
+  }
+
+  .header {
+    background-color: #fff;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 5px;
+    }
+  }
+
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+}
+
+.marg {
+  margin-top: 20px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 547e11a..332c73c 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -11,6 +11,7 @@
   certificateDate: '', // 发证日期
   validDate: '', // 有效日期
 })
+const title = ref('')
 const ruleFormRef = ref<FormInstance>()
 const rules = reactive<FormRules>({
   certificateNo: [
@@ -22,16 +23,38 @@
   certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
   validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
 })
-const initDialog = () => {
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const initDialog = (row: any) => {
+  title.value = row.title
+  if (row.title === '编辑') {
+    form.certificateNo = row.certificateNo
+    form.certificateName = row.certificateName
+    form.certificateCompany = row.certificateCompany
+    form.certificateDate = row.certificateDate
+    form.validDate = row.validDate
+  }
   dialogFormVisible.value = true
 }
 defineExpose({ initDialog })
+
 // 点击保存
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      emits('add', form)
+      if (title.value === '编辑') {
+        emits('add', form, 'update')
+      }
+      else {
+        emits('add', form, '')
+      }
       dialogFormVisible.value = false
     }
   })
@@ -45,7 +68,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
new file mode 100644
index 0000000..952da9d
--- /dev/null
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -0,0 +1,145 @@
+<!-- 计量人员列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { getStaffList } from '@/api/measure/person'
+import { getDeptTreeList } from '@/api/system/dept'
+import type { TreeStructure } from '@/views/system/user/user-interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  deptId: '', // 所在部门
+  limit: 5,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref()
+const columns = ref([
+  {
+    text: '人员编号',
+    value: 'staffNo',
+  },
+  {
+    text: '姓名',
+    value: 'name',
+  },
+  {
+    text: '所在部门',
+    value: 'deptId',
+  },
+])
+// 获取部门
+const deptIdList = ref<TreeStructure[]>([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = res.data
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = ''
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = Number(res.data.total)
+      console.log(list.value, 'list')
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    staffNo: '',
+    name: '', // 姓名
+    deptId: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const person = list.value.filter((item, index) => index == select.value)[0]
+  emits('add', person)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table
+      :data="list" :total="total" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
+      <template #preColumns>
+        <el-table-column label="选择" width="55" align="center">
+          <template #default="scope">
+            <el-radio v-model="select" :label="scope.$index" class="radio" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
+      </template>
+    </normal-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 5222e6f..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -3,11 +3,12 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/addPerson.vue'
 import type { StaffListType, StaffType } from './person-interface'
-import { exportList, getStaffDelete, getStaffList } from '@/api/measure/person'
-import { uploadApi } from '@/api/system/notice'
+import { exportList, getStaffDelete, getStaffList, uploadList } from '@/api/measure/person'
+// import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -23,14 +24,14 @@
 const columns = ref([
   { text: '人员编号', value: 'staffNo', align: 'center', width: '150' },
   { text: '姓名', value: 'name', align: 'center', width: '80' },
-  { text: '学历', value: 'education', align: 'center', width: '60' },
+  { text: '学历', value: 'education', align: 'center', width: '80' },
   { text: '性别', value: 'sex', align: 'center', width: '55' },
-  { text: '工作部门', value: 'deptId', align: 'center', width: '90' },
-  { text: '技术职务', value: 'technologyJob', align: 'center', width: '90' },
+  { text: '工作部门', value: 'deptId', align: 'center', width: '140' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '90' },
   { text: '计量专业', value: 'major', align: 'center', width: '90' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '150' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
 const printObj = ref({
@@ -172,7 +173,7 @@
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    uploadApi(fd).then((res) => {
+    uploadList(fd).then((res) => {
       if (res.code === 200) {
         ElMessage.success('上传成功')
       }
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -255,6 +256,7 @@
         <normal-table
           id="print"
           :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
           @change="changePage"
@@ -267,15 +269,15 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="240">
+            <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index 9158074..9dd5d33 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -3,9 +3,9 @@
   staffNo: string // 人员编号
   name: string // 姓名
   deptId: string // 工作部门
-  major: string // 计量专业
-  verifierCertificateNo: string // 证书号
-  certificateStatus: string // 证书状态
+  major?: string // 计量专业
+  verifierCertificateNo?: string // 证书号
+  certificateStatus?: string // 证书状态
   limit: number
   offset: number
 }
@@ -44,3 +44,9 @@
   keywords: string
   deptId: string
 }
+// 技术职务类型
+export interface technologyJobType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 7f0a151..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -1,3 +1,7 @@
+<script lang="ts" setup name="remind">
+import list from './certificateLog.vue'
+</script>
+
 <template>
-  <div>证书过期提醒</div>
+  <list :is-remind="true" authority="remind" />
 </template>
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 092edc3..1d78fe2 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -1,3 +1,406 @@
+<script lang="ts" setup name="ListSource">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from './list_interface'
+import ListPriceAdd from './priceAdd.vue'
+import { getDeletePrice, getPriceList, uploadPrice } from '@/api/system/price'
+import { exportExcel } from '@/utils/exportXlsx'
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  checkType: '',
+  // model: '',
+  priceItem: '',
+  priceName: '',
+  priceNo: '',
+  priceType: '',
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '价格编号',
+    value: 'priceNo',
+    width: '160',
+  },
+  {
+    text: '价格名称',
+    value: 'priceName',
+    width: '90',
+  },
+  {
+    text: '检校类型',
+    value: 'checkType',
+    width: '90',
+  },
+  // {
+  //   text: '型号',
+  //   value: 'model',
+  // },
+  {
+    text: '类别',
+    value: 'priceType',
+  },
+  {
+    text: '项目',
+    value: 'priceItem',
+  },
+  {
+    text: '标准价格（元)',
+    value: 'price',
+    width: '120',
+  },
+  {
+    text: '业务员折扣权限',
+    value: 'operatorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '负责人折扣权限',
+    value: 'directorDiscountPermission',
+    width: '130',
+  },
+  {
+    text: '依据标准',
+    value: 'priceStandard',
+    width: '90',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '120',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+const isPopconfirmShow = ref(false)
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  getPriceList(listQuery.value).then((response) => {
+    list.value = response.data.records
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  console.log(row)
+  ElMessageBox.confirm(
+    `确认删除${row.priceName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getDeletePrice({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const confirmEvent = () => {
+  getDeletePrice({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      ElMessage.success('删除成功')
+      fetchData(true)
+    }
+  })
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    checkType: '',
+    priceItem: '',
+    priceName: '',
+    priceNo: '',
+    priceType: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const { proxy } = getCurrentInstance() as any
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, priceNo: item.priceNo, priceName: item.priceName, checkType: item.checkType, priceType: item.priceType, priceItem: item.priceItem, price: item.price, operatorDiscountPermission: item.operatorDiscountPermission, directorDiscountPermission: item.directorDiscountPermission, priceStandard: item.priceStandard, createTime: item.createTime })),
+      name: '价格列表',
+      titleArr: ['序号', '价格编号', '价格名称', '检校类型', '类别', '项目', '标准价格（元)', '业务员折扣权限', '负责人折扣权限', '依据标准', '创建时间'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadPrice(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+          fetchData(true)
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>价格表</div>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceNo"
+            placeholder="价格编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceName"
+            placeholder="价格名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.checkType"
+            placeholder="检验类型"
+            clearable
+          />
+        </search-item>
+        <!-- <search-item>
+          <el-input
+            v-model.trim="listQuery.model"
+            placeholder="型号"
+            clearable
+          />
+        </search-item> -->
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceType"
+            placeholder="类别"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.priceItem"
+            placeholder="项目"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button v-if="proxy.hasPerm('/measure/price/import')" type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/mould')" type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/add')" type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/export')" type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="160">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/price/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+    <el-dialog
+      v-model="isPopconfirmShow"
+      title="确认框"
+      width="30%"
+    >
+      <span>确定删除吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="isPopconfirmShow = false">取消</el-button>
+          <el-button type="primary" @click="confirmEvent">
+            确定
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+
+  <list-price-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+
+:deep .search-item {
+  width: 11.5vw !important;
+}
+</style>
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
new file mode 100644
index 0000000..86a6f2c
--- /dev/null
+++ b/src/views/measure/price/list_interface.ts
@@ -0,0 +1,25 @@
+export interface IlistQuery {
+  checkType: string
+  // model: string
+  priceItem: string
+  priceName: string
+  priceNo: string
+  priceType: string
+  limit: number
+  offset: number
+}
+
+export interface IlistType {
+  priceNo: string
+  priceName: string
+  checkType: string
+  model: string
+  priceType: string
+  priceItem: string
+  price: string
+  operatorDiscountPermission: string
+  directorDiscountPermission: string
+  priceStandard: string
+  createTime: string
+}
+
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
new file mode 100644
index 0000000..2e0c9b4
--- /dev/null
+++ b/src/views/measure/price/priceAdd.vue
@@ -0,0 +1,397 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getPriceAddList, getQueryPriceInfo, getTypeSelect, getUpdatePriceInfo } from '@/api/system/price'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  checkType: '',
+  createTime: null,
+  directorDiscountPermission: '',
+  historicalPriceList: [],
+  id: null,
+  isDel: 0,
+  model: '',
+  operatorDiscountPermission: '',
+  price: '',
+  priceDescription: '',
+  priceItem: '',
+  priceLimit: '',
+  priceName: '',
+  priceNo: null,
+  priceStandard: '',
+  priceType: '',
+  remark: '',
+  updateTime: null,
+})
+const checkTypeOptions = ref([])
+const priceTypeOptions = ref([])
+const priceItemOptions = ref([])
+const operatorDiscountPermissionOptions = ref([])
+const directorDiscountPermissionOptions = ref([])
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getQueryPriceInfo({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getOptions = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'checkType') {
+      checkTypeOptions.value = res.data
+    }
+    else if (code === 'priceType') {
+      priceTypeOptions.value = res.data
+    }
+    else if (code === 'priceItem') {
+      priceItemOptions.value = res.data
+    }
+    else if (code === 'operatorDiscountPermission') {
+      operatorDiscountPermissionOptions.value = res.data
+    }
+    else if (code === 'directorDiscountPermission') {
+      directorDiscountPermissionOptions.value = res.data
+    }
+  })
+}
+getOptions('checkType')
+getOptions('priceType')
+getOptions('priceItem')
+getOptions('operatorDiscountPermission')
+getOptions('directorDiscountPermission')
+
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.priceName === '') {
+    return ElMessage.error('请填写价格名称')
+  }
+  else if (formInline.value.checkType === '') {
+    return ElMessage.error('请选择检校类型')
+  }
+  else if (formInline.value.priceType === '') {
+    return ElMessage.error('请选择类别')
+  }
+  else if (formInline.value.priceItem === '') {
+    return ElMessage.error('请选择项目')
+  }
+  else if (formInline.value.priceStandard === '') {
+    return ElMessage.error('请输入依据标准')
+  }
+  else if (formInline.value.price === '') {
+    return ElMessage.error('请输入标准价格')
+  }
+  else if (formInline.value.operatorDiscountPermission === '') {
+    return ElMessage.error('请选择业务员折扣权限')
+  }
+  else if (formInline.value.directorDiscountPermission === '') {
+    return ElMessage.error('请选择负责人折扣权限')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getPriceAddList(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    getUpdatePriceInfo(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-position="left"
+      >
+        <!-- <el-form-item label="价格编号:" label-width="auto">
+          <el-input
+            v-model="formInline.priceNo"
+            placeholder="请输入价格编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item> -->
+        <el-form-item label="价格名称:" label-width="110">
+          <el-input
+            v-model.trim="formInline.priceName"
+            placeholder="价格名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span>
+          <el-form-item label="检校类型:" label-width="110">
+            <el-select
+              v-model.trim="formInline.checkType"
+              clearable
+              placeholder="检校类型"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in checkTypeOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        <!-- <el-form-item label="创建时间:" label-width="80">
+          <el-date-picker
+              v-model="formInline.createTime"
+              type="datetime"
+              placeholder="请选择创建时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        </span>
+        <el-form-item label="类别:" label-width="auto">
+          <el-select
+            v-model.trim="formInline.priceType"
+            clearable
+            placeholder="类别"
+            style="width: 80%;"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in priceTypeOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="项目:" label-width="110">
+            <el-select
+              v-model.trim="formInline.priceItem"
+              clearable
+              placeholder="项目"
+              style="width: 80%;"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in priceItemOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="依据标准:" label-width="110">
+            <el-input
+              v-model.trim="formInline.priceStandard"
+              style="width: 18vw;"
+              clearable
+              placeholder="依据标准"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="标准价格（元):" label-width="110">
+            <el-input
+              v-model.trim="formInline.price"
+              clearable
+              placeholder="标准价格（元)"
+              size="default"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="限制范围:" label-width="110">
+            <el-input
+              v-model="formInline.priceLimit"
+              placeholder="限制范围"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+          <el-form-item label="说明:">
+            <el-input v-model="formInline.priceDescription" placeholder="说明" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="业务员折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.operatorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in operatorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="负责人折扣权限:" label-width="auto">
+            <el-select
+              v-model.trim="formInline.directorDiscountPermission"
+              style="width: 26vw;"
+              clearable
+              placeholder="业务员折扣权限"
+              size="default"
+              :disabled="buttonType === '详情'"
+            >
+              <el-option
+                v-for="item in directorDiscountPermissionOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:" label-width="110">
+            <el-input v-model="formInline.remark" placeholder="备注" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8efe918..85b2aef 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,4 +1,56 @@
+<script lang="ts" setup name="approve">
+import All from './components/all.vue' // 全部
+import DraftBox from './components/draftBox.vue' // 草稿箱
+import ApprovalPending from './components/approvalPending.vue'// 待审批
+import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
+import Passed from './components/passed.vue'// 已通过
+import NotPass from './components/notPass.vue' // 技术能力
+import Canceled from './components/canceled.vue' // 取消
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = ref<menuType[]>([
+  { name: '全部', comp: All },
+  { name: '草稿箱', comp: DraftBox },
+  { name: '待审批', comp: ApprovalPending },
+  { name: '审批中', comp: ExamineAndApprove },
+  { name: '已通过', comp: Passed },
+  { name: '未通过', comp: NotPass },
+  { name: '已取消', comp: Canceled },
+])
+const current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>溯源供方审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
new file mode 100644
index 0000000..7a5e9cd
--- /dev/null
+++ b/src/views/measure/source/components/all.vue
@@ -0,0 +1,8 @@
+<!-- 全部 -->
+<script lang="ts" setup name="all">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="全部" />
+</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
new file mode 100644
index 0000000..c3ebb16
--- /dev/null
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -0,0 +1,8 @@
+<!-- 待审批 -->
+<script lang="ts" setup name="approvalPending">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="待审批" />
+</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
new file mode 100644
index 0000000..2ee9818
--- /dev/null
+++ b/src/views/measure/source/components/canceled.vue
@@ -0,0 +1,8 @@
+<!-- 取消 -->
+<script lang="ts" setup name="canceled">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="取消" />
+</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
new file mode 100644
index 0000000..cac05fc
--- /dev/null
+++ b/src/views/measure/source/components/draftBox.vue
@@ -0,0 +1,8 @@
+<!-- 草稿箱 -->
+<script lang="ts" setup name="draftBox">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="草稿箱" />
+</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
new file mode 100644
index 0000000..ec6232b
--- /dev/null
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -0,0 +1,8 @@
+<!-- 审批中 -->
+<script lang="ts" setup name="examineAndApprove">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="审批中" />
+</template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
new file mode 100644
index 0000000..e89a838
--- /dev/null
+++ b/src/views/measure/source/components/listPage.vue
@@ -0,0 +1,342 @@
+<script lang="ts" setup name="ListSource">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery, IlistType } from '../list_interface'
+import ListSourceAdd from '../listAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '溯源供方编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '溯源供方名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '业务内容',
+    value: 'businessContent',
+  },
+  {
+    text: '业务资质',
+    value: 'briefName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '联系方式',
+    value: 'mobile',
+  },
+  {
+    text: '地址',
+    value: 'companyCity',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '200',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+const checkoutList = ref([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getSoucreList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (checkoutList.value.length <= 0) {
+    exportExcel({
+      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+      name: '溯源供方',
+      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      const fd = new FormData()
+      fd.append('multipartFile', event.target.files[0])
+      uploadApi(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('上传成功')
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+const upload = () => {
+  fileRef.value.click()
+}
+const uploadAll = () => {
+  upload()
+}
+const add = () => {
+  buttonType.value = ''
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierNo"
+            placeholder="溯源供方编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.supplierName"
+            placeholder="溯源供方名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="业务内容"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="地址"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </template>
+        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-source-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
new file mode 100644
index 0000000..3bd125a
--- /dev/null
+++ b/src/views/measure/source/components/notPass.vue
@@ -0,0 +1,8 @@
+<!-- 未通过 -->
+<script lang="ts" setup name="notPass">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="未通过" />
+</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
new file mode 100644
index 0000000..edf5168
--- /dev/null
+++ b/src/views/measure/source/components/passed.vue
@@ -0,0 +1,8 @@
+<!-- 通过 -->
+<script lang="ts" setup name="passed">
+import listPage from './listPage.vue'
+</script>
+
+<template>
+  <list-page name="已通过" />
+</template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 136f0a8..a771ad6 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -19,6 +19,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref([])
+const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
@@ -72,7 +73,6 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
-const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
@@ -101,21 +101,31 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
-const confirmEvent = () => {
-  getSoucreListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 const cancelEvent = () => {
   console.log('cancel!')
 }
@@ -257,19 +267,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="uploadAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/import')" type="primary" @click="uploadAll">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -282,6 +292,7 @@
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
                   link
@@ -298,6 +309,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
                   size="small"
                   link
                   type="danger"
@@ -311,21 +323,6 @@
         </normal-table>
       </table-container>
     </app-container>
-    <el-dialog
-      v-model="isPopconfirmShow"
-      title="确认框"
-      width="30%"
-    >
-      <span>确定删除吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="isPopconfirmShow = false">取消</el-button>
-          <el-button type="primary" @click="confirmEvent">
-            确定
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
   </div>
 
   <list-source-add
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index dd27406..2680597 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
 import type { IformInline } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
 const props = defineProps({
   infoId: {
@@ -57,6 +58,7 @@
   { text: '联系方式', value: 'phone' },
 ]
 const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
 const cityList = ref([])
 const areaList = ref([])
 const invoiceProvince = ref([])
@@ -190,17 +192,54 @@
     })
   }
 }
-// 文件上传限制
-const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log(files, 'wenjian')
-  upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-  file.uid = genFileId()
-  upload.value!.handleStart(file)
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
 }
-// 文件上传成功
-const uploadSuccess = (file) => {
-  formInline.value.minioFileName = file.name
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
 }
 if (props.buttonType !== '') {
   getInfo()
@@ -230,71 +269,81 @@
         label-width="100"
         label-position="left"
       >
-        <el-form-item label="溯源供方编号:">
-          <el-input
-            v-model="formInline.supplierNo"
-            placeholder="请输入溯源供方编号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司名称:">
-          <el-input
-            v-model="formInline.supplierName"
-            placeholder="请输入公司名称"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="公司简称:">
-          <el-input v-model="formInline.briefName" placeholder="请输入公司简称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="业务内容:">
-          <el-input
-            v-model="formInline.businessContent"
-            placeholder="请输入业务内容"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="税号:">
-          <el-input v-model="formInline.taxNumber" placeholder="请输入税号" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账户名:">
-          <el-input
-            v-model="formInline.bankAccount"
-            placeholder="请输入银行账户名"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="银行名称:">
-          <el-input v-model="formInline.bankName" placeholder="请输入银行名称" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="银行账号:">
-          <el-input
-            v-model="formInline.bankAccountNumber"
-            placeholder="请输入银行账号"
-            :disabled="buttonType === '详情'"
-          />
-        </el-form-item>
-        <el-form-item label="邮编:">
-          <el-input v-model="formInline.postalCode" placeholder="请输入邮编" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="负责人:">
-          <el-input v-model="formInline.director" placeholder="请输入负责人" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="电话:">
-          <el-input v-model="formInline.phone" placeholder="请输入电话" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="传真:">
-          <el-input v-model="formInline.fax" placeholder="请输入传真" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="手机:">
-          <el-input v-model="formInline.mobile" placeholder="请输入手机" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="邮箱:">
-          <el-input v-model="formInline.mailbox" placeholder="请输入邮箱" :disabled="buttonType === '详情'" />
-        </el-form-item>
-        <el-form-item label="网址:">
-          <el-input v-model="formInline.website" placeholder="请输入网址" :disabled="buttonType === '详情'" />
-        </el-form-item>
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
         <div class="info-dizhi">
           <el-form-item label="公司地址:">
             <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
@@ -341,28 +390,28 @@
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formInline.businessScope"
-              placeholder="请输入公司业务范围"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
         </span>
         <span class="input-width">
           <el-form-item label="备注:">
-            <el-input v-model="formInline.remark" placeholder="请输入备注" :disabled="buttonType === '详情'" />
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
           </el-form-item>
         </span>
         <div class="info-appendix">
           <el-form-item label="附件:">
             <el-upload
-              ref="upload"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :limit="1"
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
               :on-exceed="handleExceed"
-              :on-change="uploadSuccess"
-              :auto-upload="false"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
             >
-              <span v-if="formInline.minioFileName">{{ formInline.minioFileName }}</span>
               <el-button :disabled="buttonType === '详情'">
                 上传
               </el-button>
@@ -412,6 +461,15 @@
       完成
     </el-button>
   </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
 </template>
 
 <style lang="scss" scoped>
@@ -433,10 +491,15 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 5px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
   .info-dizhi {
     margin-right: 155px;
   }
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index a2f21a5..21be0d5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -19,7 +19,6 @@
 const list = ref([])
 // 删除id
 const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -40,63 +39,63 @@
   })
 }
 fetchData(true)
-
+const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref([
   {
     text: '计划编号',
     value: 'planNo',
-    width: '160',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '120',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '120',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '180',
+    width: '120',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '120',
+    width: '80',
   },
 ])
 // 搜索
@@ -153,12 +152,29 @@
 }
 // 点击删除
 const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
+  ElMessageBox.confirm(
+    `确认删除${row.planName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -181,14 +197,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,13 +290,13 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/plan/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -297,9 +305,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="220">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
                   size="small"
                   type="primary"
                   link
@@ -316,6 +325,7 @@
                   详情
                 </el-button>
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
                   size="small"
                   link
                   type="danger"
@@ -342,21 +352,6 @@
     :button-type="buttonType"
     @close="close"
   />
-  <el-dialog
-    v-model="isPopconfirmShow"
-    title="确认框"
-    width="30%"
-  >
-    <span>确定删除吗?</span>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="isPopconfirmShow = false">取消</el-button>
-        <el-button type="primary" @click="confirmEvent">
-          确定
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2ce01d7..8c73928 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -159,7 +159,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训计划
+        培训计划
       </h4>
       <div>
         <el-button
@@ -186,28 +186,28 @@
         <el-form-item label="计划编号:">
           <el-input
             v-model="formInline.planNo"
-            placeholder="请输入计划编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.planName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -226,7 +226,7 @@
         <el-form-item label="培训学时:" label-width="auto">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -249,21 +249,21 @@
         <el-form-item label="实施单位:" label-width="auto">
           <el-input
             v-model="formInline.effectiveCompany"
-            placeholder="请输入实施单位"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="负责人:">
           <el-input
             v-model="formInline.director"
-            placeholder="请输入负责人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -271,7 +271,7 @@
           <el-form-item label="培训内容:">
             <el-input
               v-model="formInline.trainContent"
-              placeholder="请输入培训内容"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -280,7 +280,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -291,7 +291,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -375,7 +375,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 6524e67..2769c7a 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -37,9 +37,9 @@
   createTime: string
   deptName: string
   director: string
-  effectiveCompany: string
+  logNo: string
   planName: string
-  planNo: string
+  trainName: string
   remark: string
   trainAddress: string
   trainContent: string
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 56b2ec7..e9e46f2 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
-import { reactive, ref } from 'vue'
-import { ElLoading, ElMessage } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading } from 'element-plus'
 import type { IlistQuerys, IlistTypes } from './plan_interface'
 import PlanAdd from './trainLogAdd.vue'
 import { exportExcel } from '@/utils/exportXlsx'
-import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+import { getDeptTree, getLogList } from '@/api/system/plan'
 const listQuery: Ref<IlistQuerys> = ref({
   trainTime: '',
   createTime: '',
@@ -16,9 +16,6 @@
 })
 const checkoutList = ref([])
 const list = ref([])
-// 删除id
-const deleteId = ref('')
-const isPopconfirmShow = ref(false)
 const total = ref(0)
 const show = ref(true)
 const infoId = ref('')
@@ -65,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '120',
+    width: '90',
   },
   {
-    text: '培训对象',
+    text: '培训时间',
     value: 'trainPerson',
     width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '120',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -112,22 +109,23 @@
   })
   if (checkoutList.value.length <= 0) {
     exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   else {
     exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
-      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, logNo: item.logNo, trainName: item.trainName, trainTime: item.trainTime, trainAddress: item.trainAddress, trainHour: item.trainHour, trainPerson: item.trainPerson, trainNumber: item.trainNumber, createTime: item.createTime, remark: item.remark })),
+      name: '培训记录',
+      titleArr: ['序号', '记录编号', '培训名称', '培训时间', '培训地点', '培训学时', '培训时间', '培训人数', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
   }
   loading.close()
 }
+const { proxy } = getCurrentInstance() as any
 // 关闭编辑
 const close = () => {
   show.value = true
@@ -139,14 +137,8 @@
   buttonType.value = type
   show.value = false
 }
-// 点击删除
-const handleDelete = (index: string, row: object) => {
-  isPopconfirmShow.value = true
-  deleteId.value = row.id
-}
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
-  console.log(e, '666')
   checkoutList.value = e
 }
 const add = () => {
@@ -169,14 +161,6 @@
   })
 }
 getDept()
-const confirmEvent = () => {
-  getListDelete({ id: deleteId.value }).then((res) => {
-    if (res.code === 200) {
-      isPopconfirmShow.value = false
-      fetchData(true)
-    }
-  })
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -255,19 +239,19 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/import')" type="primary" @click="add">
             批量导入
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" type="primary" @click="add">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportAll">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" type="primary" @click="exportAll">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -276,9 +260,10 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="120">
               <template #default="{ row }">
                 <el-button
+                  v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
                   size="small"
                   type="primary"
                   link
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index f180b1a..bb9d6a9 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -174,7 +174,7 @@
   <app-container>
     <div class="top-info">
       <h4 class="title">
-        新建培训记录
+        培训记录
       </h4>
       <div>
         <el-button
@@ -201,14 +201,14 @@
         <el-form-item label="编号:">
           <el-input
             v-model="formInline.logNo"
-            placeholder="请输入编号"
+            :placeholder="buttonType === '详情' ? '无' : '请输入编号'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="填表人:">
           <el-input
             v-model="formInline.preparer"
-            placeholder="请输入填表人"
+            :placeholder="buttonType === '详情' ? '无' : '请输入填表人'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -244,28 +244,28 @@
         <el-form-item label="培训名称:">
           <el-input
             v-model="formInline.trainName"
-            placeholder="请输入培训名称"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训对象:">
           <el-input
             v-model="formInline.trainPerson"
-            placeholder="请输入培训对象"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训人数:">
           <el-input
             v-model="formInline.trainNumber"
-            placeholder="请输入培训人数"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
         <el-form-item label="培训学时:">
           <el-input
             v-model="formInline.trainHour"
-            placeholder="请输入培训学时"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -282,7 +282,7 @@
         <el-form-item label="培训地点:">
           <el-input
             v-model="formInline.trainAddress"
-            placeholder="请输入培训地点"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
             :disabled="buttonType === '详情'"
           />
         </el-form-item>
@@ -290,7 +290,7 @@
           <el-form-item label="培训效果:">
             <el-input
               v-model="formInline.trainEffect"
-              placeholder="请输入培训效果"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训效果'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -299,7 +299,7 @@
           <el-form-item label="存在问题:">
             <el-input
               v-model="formInline.problems"
-              placeholder="请输入存在问题"
+              :placeholder="buttonType === '详情' ? '无' : '请输入存在问题'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -308,7 +308,7 @@
           <el-form-item label="改进措施:">
             <el-input
               v-model="formInline.improveMethod"
-              placeholder="请输入改进措施"
+              :placeholder="buttonType === '详情' ? '无' : '请输入改进措施'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -317,7 +317,7 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
-              placeholder="请输入备注"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
               :disabled="buttonType === '详情'"
             />
           </el-form-item>
@@ -328,7 +328,7 @@
       <div class="table-top-title">
         人员信息
       </div>
-      <div class="table-top-button">
+      <div v-if="buttonType !== '详情'" class="table-top-button">
         <el-button :disabled="buttonType === '详情'" @click="deleteList">
           删除行
         </el-button>
@@ -413,7 +413,7 @@
 
 .info-content {
   margin-top: 10px;
-  padding: 10px;
+  padding: 30px;
   border-radius: 10px;
   background-color: #fff;
 
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 2aaa7c5..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -3,8 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
+import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -39,6 +42,7 @@
 }
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
+  console.log(ruleForm.noticeContent)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -66,33 +70,173 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // if (event.target.files[0].type === 'application/pdf') {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
 }
+// 富文本实例对象
+const editorRef = shallowRef()
+// 菜单配置
+const toolbarConfig = ref({})
+// 编辑器配置
+const editorConfig = ref({
+  placeholder: '请输入内容...',
+  MENU_CONF: {
+    // 配置上传图片
+    uploadImage: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
+      maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
+      fieldName: 'img', // 上传类型
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   image_class_id: "2",
+      //   file_type: "1",
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+      // // 单个文件上传成功之后
+      // onSuccess(file, res) {
+      //     console.log(`${file.name} 上传成功`, res)
+      // },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log()
+        // res 即服务端的返回结果
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          const alt = ''
+          const href = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, alt, href)
+        })
+      },
+    },
+    // 配置上传视频
+    uploadVideo: {
+      server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
+      maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
+      fieldName: 'your-custom-name', // 上传类型
+      // 最多可上传几个文件，默认为 5
+      maxNumberOfFiles: 3,
+      allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
+      // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
+      // meta: {
+      //   type: 1,
+      // },
+      // 自定义设置请求头，比如添加token之类的
+      // headers: {
+      //     Accept: 'text/x-json',
+      //     otherKey: 'xxx'
+      // },
+      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // 上传之前触发
+      onBeforeUpload(file: any) {
+        // file 选中的文件，格式如 { key: file }
+        return file
+        // 可以 return
+        // 1. return file 或者 new 一个 file ，接下来将上传
+        // 2. return false ，不上传这个 file
+      },
+
+      // 上传进度的回调函数，可以用来显示进度条
+      onProgress(progress: any) {
+        // progress 是 0-100 的数字
+        console.log('progress', progress)
+      },
+
+      // // 单个文件上传成功之后
+      onSuccess(file: any, res: any) {
+        console.log(`${file.name} 上传成功`, res)
+      },
+
+      // 单个文件上传失败
+      onFailed(file: any, res: any) {
+        console.log(`${file.name} 上传失败`, res)
+      },
+
+      // 上传错误，或者触发 timeout 超时
+      onError(file: any, err: any, res: any) {
+        console.log(`${file.name} 上传出错`, err, res)
+      },
+
+      // 插入图片到富文本编辑器回显
+      customInsert(res: any, insertFn: any) {
+        console.log(res, '视频插入')
+        // res 即服务端的返回结果
+        // let url = res.data.url;
+        // let poster = res.data.poster;
+        // 从 res 中找到 url poster ，然后插入
+        // 参数url是视频地址，poster是视频封面图片，后端如果不返回，可以考虑写死一个固定的封面图
+        getPhotoUrl(res.data[0]).then((res) => {
+          const url = res.data
+          // 从 res 中找到 url alt href ，然后插入图片
+          insertFn(url, '')
+        })
+      },
+    },
+  },
+})
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
+const look = () => {
+  console.log(ruleForm.noticeContent)
+}
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -125,12 +269,29 @@
         <el-input v-model.trim="ruleForm.noticeSketch" />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <toolbar
+            style="border-bottom: 1px solid #dcdfe6;width: 100%;border-radius: 4px;"
+            :editor="editorRef"
+            :default-config="toolbarConfig"
+            mode="default"
+          />
+          <editor
+            v-model="ruleForm.noticeContent"
+            style="height: 150px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            @onCreated="onCreated"
+          />
+        </div>
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
@@ -146,4 +307,24 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .w-e-bar {
+      padding: 0;
+
+      .w-e-bar-item {
+        padding: 0;
+        height: 30px;
+      }
+
+      .w-e-bar-divider {
+        margin: 0;
+        display: none;
+        width: 0;
+        height: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index cdac018..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -159,7 +160,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 17142a1..441ef0f 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="noticeDetail">
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
+import { getPhotoUrl } from '@/api/system/tool'
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
   noticePublisher: '', // 发布人
@@ -13,7 +14,6 @@
   noticeTitle: '', // 标题
 }) // 表单
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 // 弹窗初始化
 const initDialog = (row: noticeType) => {
   dialogVisible.value = true
@@ -44,10 +44,14 @@
 const submitForm = () => {
   dialogVisible.value = false
 }
-// 取消
-// const resetForm = () => {
-//   dialogVisible.value = false
-// }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -84,11 +88,12 @@
         <el-input v-model.trim="ruleForm.noticeSketch" disabled />
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+        <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
       </el-form-item>
       <el-form-item label="查看附件">
-        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
-          附件
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
@@ -104,4 +109,6 @@
   </el-dialog>
 </template>
 
-<style lang="ts" scoped></style>
+<style lang="ts" scoped>
+
+</style>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index bb1db43..d34e8ef 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签名描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -47,6 +46,7 @@
   ruleForm.minioFileName = ''
   ruleForm.userIdList = []
   ruleForm.signDirector = ''
+  ruleForm.id = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
   // ruleForm.noticeCompany = userInfo.$state.deptName
@@ -56,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -68,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +86,9 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -189,20 +194,14 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
-        <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
@@ -224,5 +223,10 @@
       }
     }
   }
+
+  .center {
+    display: flex;
+    align-items: flex-end;
+  }
 }
 </style>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8e45161..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 
@@ -177,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 304885c..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,9 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index eb26fd0..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +26,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +119,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '证书报告',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+  // 下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +179,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 304885c..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -4,6 +4,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { templateType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
 import { templateAdd, templatePageDetail, templateUpdate } from '@/api/system/tool'
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  templateDesc: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -56,7 +55,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.templateNo = row.templateNo
     ruleForm.templateName = row.templateName
     // ruleForm.createTime = row.createTime
@@ -67,8 +66,11 @@
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ templateNo: row.templateNo, templateType: row.templateType, templateName: row.templateName, templateCreator: row.templateCreator, createTime: row.createTime }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+    templatePageDetail({ ...row }).then((res) => {
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -83,7 +85,10 @@
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.templateType = row.templateType
@@ -189,16 +194,10 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 86ed065..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -7,8 +7,8 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -25,7 +25,7 @@
   { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
   { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
@@ -62,7 +62,7 @@
   addRef.value.initDialog({
     ...row,
     templateType: searchQuery.templateType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -118,12 +118,7 @@
 }
 // 下载
 const exportSele = (row: templateType) => {
-  exportExcel({
-    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
-    name: '原始记录模板',
-    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
-    sheetName: 'sheet1',
-  })
+//  下载模板
 }
 // 导出
 const exportExcelBtn = () => {
@@ -183,7 +178,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
         />
       </search-item>
@@ -196,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -222,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/showPhoto.vue b/src/views/system/tool/showPhoto.vue
new file mode 100644
index 0000000..fb142e5
--- /dev/null
+++ b/src/views/system/tool/showPhoto.vue
@@ -0,0 +1,73 @@
+<script lang="ts" setup name="showPhoto">
+import { getPhotoUrl } from '@/api/system/tool'
+const props = defineProps({
+  minioFileName: {
+    type: String,
+    required: true,
+  },
+  // title: {
+  //   type: String,
+  //   required: true,
+  // },
+  height: {
+    type: String,
+    default: '100px',
+  },
+  width: {
+    type: String,
+    default: '100px',
+  },
+})
+const isPhoto = computed(() => {
+  return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
+})
+const url = ref('')
+const getPhoto = () => {
+  if (props.minioFileName) {
+    getPhotoUrl(props.minioFileName).then((res) => {
+      url.value = res.data
+    })
+  }
+}
+onMounted(() => {
+  getPhoto()
+})
+onUpdated(() => {
+  getPhoto()
+})
+</script>
+
+<template>
+  <div class="container">
+    <el-image
+      v-if="props.minioFileName && isPhoto"
+      :style="{ width: props.width, height: props.height }"
+      :src="url"
+      :preview-src-list="[url]"
+      fit="cover"
+    />
+    <el-link
+      v-else :href="url" type="primary"
+      style="margin-right: 10px;"
+      target="_blank"
+    >
+      {{ props.minioFileName }}
+    </el-link>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  ::v-deep {
+    .el-link::after {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      height: 0;
+      bottom: 0;
+      border-bottom: 1px solid var(--el-link-hover-text-color);
+    }
+  }
+}
+</style>
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 4f1305e..00046f8 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -4,9 +4,10 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import type { signType } from '../tool_interface'
+import showPhoto from '../showPhoto.vue'
 import { getUserList } from '@/api/system/user'
 import { uploadApi } from '@/api/system/notice'
-import { addApi, listPageDetailApi, updateApi } from '@/api/system/tool'
+import { addApi, getPhotoUrl, listPageDetailApi, updateApi } from '@/api/system/tool'
 import type { userType } from '@/views/system/user/user-interface'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -26,12 +27,10 @@
   userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   signName: [{ required: true, message: '签章名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签章负责人不能为空', trigger: 'blur' }],
-  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
-  signDesc: [{ required: true, message: '签章描述不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
-const baseUrl = 'http://111.198.10.15:21409' + '/static/'
 const getuser = () => {
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
@@ -57,7 +56,7 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
-  else if (row.title === '更新') {
+  else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
     // ruleForm.createTime = row.createTime
@@ -69,7 +68,10 @@
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
     // 修改
   }
@@ -84,7 +86,10 @@
     ruleForm.signDirector = row.signDirector
     // 获取详情列表
     listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.userIdList = res.data.rows[0].userIdList
+      // ruleForm.id = res.data.id
+      res.data.userList.forEach((element: userType) => {
+        ruleForm.userIdList?.push(element.id)
+      })
     })
   }
   ruleForm.signType = row.signType
@@ -128,6 +133,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
+  console.log()
   // 原生上传
   // 创建formdata对象
   const fd = new FormData()
@@ -187,17 +193,11 @@
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签章图片" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
-          上传
+        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <el-link
-          v-if="title === '详情'" :href="baseUrl + ruleForm.minioFileName" type="primary"
-          target="_blank"
-        >
-          附件
-        </el-link>
-        <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 8ecbc8c..94d216e 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -62,7 +63,7 @@
   addRef.value.initDialog({
     ...row,
     signType: searchQuery.signType,
-    title: '更新',
+    title: '编辑',
   })
 }
 // 详情
@@ -123,17 +124,6 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-  //   if (res.code === 200) {
-  //     exportExcel({
-  //       json: res.data.rows.map((item: signType, index: number) => ({ index: index + 1, signNo: item.signNo, signName: item.signName, signDirector: item.signDirector, createTime: item.createTime, signDesc: item.signDesc })),
-  //       name: '签章管理',
-  //       titleArr: ['序号', '签章编号', '签章名称', '签章负责人', '创建时间', '描述'],
-  //       sheetName: 'sheet1',
-  //     })
-  //   }
-  //   loading.close()
-  // })
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签章管理')
     loading.close()
@@ -186,7 +176,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
         />
       </search-item>
@@ -199,13 +189,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -225,13 +215,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/tool_interface.ts b/src/views/system/tool/tool_interface.ts
index 86d9771..d01ef36 100644
--- a/src/views/system/tool/tool_interface.ts
+++ b/src/views/system/tool/tool_interface.ts
@@ -19,14 +19,14 @@
   createTime: string
   id?: string
   isDel?: number
-  minioFileName?: string
+  minioFileName: string
   signDesc?: string
   signDirector?: string
   signName?: string
   signNo?: string
   signType?: string
   updateTime?: string
-  userIdList?: null | string[]
+  userIdList: string[]
   title?: string
 }
 // 模板列表类型
@@ -35,12 +35,13 @@
   createTime?: string
   id?: string
   isDel?: number
-  minioFileName?: string
+  minioFileName: string
   templateCreator?: string
   templateDesc?: string
   templateName?: string
   templateNo?: string
   templateType?: string
   updateTime?: string
-  userIdList?: string | null | string[]
+  userIdList: string[]
 }
+